Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev