Merge "Fix override setBufferCount"