Merge "Fix restoring surface for child windows" into nyc-dev