Merge "SnapdragonCamera: Fix panorama cancel button location" into camera.lnx.1.0-dev.1.0