am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

* commit 'f21daf4718bbd5662eae843f5a56e039bd34a2f4':
  Avoid a deadlock during EmptyBufferDone