Merge "The order of child windows is switched"