Merge "SnapdragonCamera: fix W+T UI issues" into camera.lnx.1.0-dev.1.0