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