Merge "Disable VR compatibility display"