Merge "Re-enable default display when switching to VR mode." into oc-dr1-dev