Merge "MediaPlayer2: catch RejectedExecutionException"