Merge "Camera: Dont reset camera state while capture is in progress."