Merge "MediaPlayer2: fix checking for next datasources"