Merge "Revert "MediaSession2: Add playlist parameter supports""