Merge "BufferQueues: clean up BufferItemConsumer constructors" into main