Merge "flatland: ConsumerBase-based classes now create their own BufferQueues" into main