Merge "Make Task have type ActivityRecord children (55/n)"