Add handling of tasks being removed.

Change-Id: I6141f17310e61dc6b86052ca81a17a51cc6a2193
2 files changed