Mk2 812 revisit stop the music and how radio and jukebox handle this

[alan-mycroft]

Description

I've re-arranged the "music" related stop phrases so that they will apply to either radio or jukebox.

Type of PR

If your PR fits more than one category, there is a high chance you should submit more than one PR. Please consider this carefully before opening the PR. Either delete those that do not apply, or add an x between the square brackets like so: - [x]

• [ ] Bugfix
• [X] Feature implementation
• [ ] Refactor of code (without functional changes)
• [ ] Documentation improvements
• [ ] Test improvements

Testing

"Play Radio" "Stop music" "Play jukebox" "Stop music"