fix queuing of songs starting playback if something is already playing (fixes #15545)
Merge pull request #5729 from Montellese/fix_music_queuing_15545

fix queuing of songs starting playback if something is already playing
show correct dialog header text for master lock code. fixes #15543
Merge pull request #5720 from MartijnKaijser/15543

show correct dialog header text for master lock code. fixes #15543