Merge "Snapcam: disable mfnr+flash when SWMFNR" into camera-SnapdragonCamera.lnx.4.1