Merge "Fixing crash loop when the parent affiliated task is removed."