Merge "Fix VR transition for display on/off sequence." into nyc-dev