Use nicer formatting for key ids in comboboxes
(cherry picked from commit 8532ab7b8c95b3df9979f0320acd9425add9af17)