Reapply "S68452: Replaced PillPicker with single select ComboBox."

This reverts commit 500690af95954e669db47fd8475ec05fe1ef2cbd.