Merge "Reparent child surfaces when swapping out new surfaces"