Merge "Revert "SnapdragonCamera: Modify SnapdragonCamera UI""