Merge "Revert "SnapdragonCamera: Improved panorama""