Merge "Remove VR handling for night display"