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

Change-Id: I180ffea5b3ac59019b64f2d7859794faecf1fb10