Merge "CallStyle: add missing null check for icon" into main