Clear items in ComboBox only if changed (#10924)

Selection is now sent only as a key, removed redundant attribute on the
item.

Change-Id: I882d4ae17a1dc91f7a55a0b4a94e47c078ffc022