Merge "Use queue to defer all task events"