Merge "MediaPlayer2: allow prepared->pause"