Merge "MediaPlayer2: seekTo does not change state."