Merge "Unhide MediaPlayer.setNextMediaPlayer"