Merge "SnapdragonCamera: Enhancing makeup UI" into camera.lnx.1.0-dev.1.0