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

Change-Id: Ifc4138b41e801baf2acb06f83fd77115a74e71f2