Merge "rename dev-option "Auto Focus Mode"" into camera-SnapdragonCamera.lnx.2.0