Merge "Fix defer display updates trunk stable flag namespace" into main