Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev