Merge "SnapdragonCamera: Resolve camera control overlapping issue" into camera.lnx.1.0-dev.1.0