Quality of life improvements to move between different playback devices

2021 clean-up: duplicate