Merge "fix recording time dismiss issue" into camera-SnapdragonCamera.lnx.2.0