Merge "MediaSession2/Controller2: Add playlist support"