Merge pull request #2617 from abarth/reparent_ordering

Handle the case of reparenting while updating children