Merge "BufferQueueProducer: Slot may have null buffer" into rvc-dev