Merge "SnapdragonCamera: Screen goes black when saving panoramic pictures" into camera.lnx.1.0-dev.1.0