Merge "MediaSession2: Remove SessionPlayer2"