Increase timeout
Reverted "Prevent applications from bypassing Android APIs"

Closed #1039