Merge "Revert "SnapdragonCamera: Add preview thumbnail button""