Merge "Fix flaky ConsumerQueue::Dequeue after import"