Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier