Merge "SnapdragonCamera: Disable color effects when scene mode is non-automatic" into camera.lnx.1.0-dev.1.0