Merge "Remove the tasks created by the organizer when it dies." into tm-dev