Merge "Revert^2 "CallStyle: Also handle null label to glue"" into main