Merge "SnapdragonCamera: fix crash with persist.panel.orientation"