Merge changes from topic "cherrypicker-L63500030002772203:N60600030045907686" into 24D1-dev

* changes:
  CallStyle: don't reglue icon+label if never glued
  CallStyle: Also handle null label to glue
  CallStyle: Handle null icon to glue