Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev