Merge "Revert "Fix VR interaction with screen on/off/lockscreen.""