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