Merge "BQ: Get rid of setBufferCount"