Merge "Clean up handling of VR surface updates."