Merge "Reparent child surface layers when TDA migrate to new surface control" into sc-dev