Merge "Add defer display updates trunk stable flag" into main