Merge "MediaPlayerBase API"