Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev