Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into main