Merge "Fix force close when TAF before repeating" into camera-SnapdragonCamera.lnx.2.0