Merge "Clean up handling of VR surface updates." into oc-mr1-dev