Merge "Move VR preference for portrait orientation." into oc-dr1-dev