Merge "MediaSession2: Stop overriding MediaPlayerBase for session/controller"