Merge "Add window to child window list with correct order"