Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am: 34b2389fcf

Change-Id: I90669fbeed47a0f75e4f113a155cd54ab681a3c8