Merge "Re-enable default display when switching to VR mode." into oc-dr1-dev am: efa87ca42e
am: 3b2c4d541c

Change-Id: Iaae16cb9f6c49c18ae0c739665c5e5b02bacdf99