Fix ComboBox issue with font-based item icons (#14660)

Change-Id: I8f3de9556cc62670c28523886998f89383b76305