Merge "SnapdragonCamera: Make switcher visible only when it was" into camera.lnx.1.0-dev.1.0