Merge "Have better separation between adding, positioning, and reparenting task"