Merge "Fix VR mode handling when the screen blanks and unblanks." into nyc-dev