Merge "SnapdragonCamera: Fix incorrect focus mode" into camera.lnx.1.0-dev.1.0