Merge "Revert "Use queue to defer all task events""