Add rooms to device choser dropdown

[hartmark]

I have ordered all my devices in different rooms, and for example named all roof toggles as "Roof lamp".

All is whell when I try to create an event for example as I get this screen with all devices ordered in the different rooms:

However in some parts I get only a drop-down to select the device, for example when using the "Toggle Devices" app.

The best solution is to have the dropdown replaced with the same device-picker as in the event screen.
A quick fix would be to prefix the device-name in the dropdown with the room so I get "Livingroom - Roof" instead of multiple "Roof" for each room.