Merge "Do not constrain width/height of child windows at layout." into nyc-dev