Add ugly delays in TakePictureActivityTest for travis
Merge branch 'fix-api-upload-tests-for-travis'
Decrease delays for travis. Not longer than 10 seconds