Increase Emulator Timeout
Merge branch 'increase-emulator-timeout' into change-camera-to-cwac