Merge "Avoid adding to root when parent is destroyed"