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

Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382