Merge "Remove swipe to exit persistent Vr mode behavior" into oc-dev