TaskContext does not hold a reference to Task; instead, it has a shared instance of TaskMetrics with Task
fully revert change to addOnCompleteCallback -- missed this in e9f53ec