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

Change-Id: I91f1912d21c5abd8d96130ee6037b2c08bc9df50