Increase Emulator Timeout
Merge branch 'increase-emulator-timeout' into change-camera-to-cwac
Merge branch 'change-camera-to-cwac' into move-crop-to-upload-screen