Bug 961579 - Fix intermittent failure of test_camera_capture_video and test_camera_capture_photo