Merge "SnapdragonCamera: Color Filter menu incorrectly displayed" into camera.lnx.1.0-dev.1.0