develop
Redesign the interaction selector.
Fix part of #2575: Interactions refactor first milestone (#4115)