Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev