Merge "Reparent children before reparenting to null"