Picker
This PR re-aligns the `Picker` editor with the entries after the changes in #3764. Release Notes: - N/A