Merge change 23165 into eclair

* changes:
  Fixes a race condition between entering ERROR state and initial buffer submit.