Merge "Deprecate producer/consumer usage in BufferHub" into pi-dev