Merge "Removed __unused variable macro usage from ESQueue.cpp"