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