Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp