Merge "Remove modern_queue_enabled flag." into main