Merge "MediaPlayer2: skip commands when in error state"