Adding a child to a null parent now adds to the root node, if set.

Change-Id: I63860bff3bb769cff6644c59363cb374f15a0b6e