Merge "SnapdraongCamera:Fix Heif Options" into camera-SnapdragonCamera.lnx.2.0