Merge "Fix layout for child windows" into nyc-dev