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

Change-Id: I6105c334594e4996d76c0d3429a6ed81c7131cee