Merge pull request #11901 from ThomasChr/randonplaylistorder