Merge "CallStyle: don't reglue icon+label if never glued" into main