Merge "C2BqBuffer: Clear a cached buffer if reallocation is needed"