Merge "SnapdragonCamera: Fix the camera setting corruption issue" into camera.lnx.1.0-dev.1.0