Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/camera/app.py
kk