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

This reverts commit 784f20651a59cfa2356f9cd65a5b734a0e477b2e.