Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev am: e63965cef5
am: 83876c735e

Change-Id: I843e2469694c31ee23148ae09cb7b9c5d7506bfc