Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev