Merge "Use std::deque for EventEntry queues"