Merge "TaskOrganizer: Implement lifetime changes for testing."