Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev