Merge "CallStyle: Handle null icon to glue" into main