Merge "Fix override setBufferCount" into rvc-qpr-dev