tweaks for testing on android emulator