Merge "Prepare an interface for deferred display updates" into main