Merge "SnapdragonCamera: FR36364 Restore Defaults" into camera.lnx.1.0-dev.1.0