Merge "SnapdragonCamera: Add zoom option to developer option" into camera.lnx.1.0-dev.1.0