Merge "Remove swipe to exit persistent Vr mode behavior" into oc-dev am: bd3d0dea88
am: 1f43c9733c

Change-Id: I688f0929c727de64d58dcbec04974415425604fa