Merge "C2BqBuffer: resolve 3 way deadlock"