Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev