Merge "Clean up deferDisplayUpdates flag" into main