Merge "Copy child window list when destroying surface"