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

Change-Id: I149f9ea222d058b6b42405dabd2d27f44706a853