Merge "Do not adjust child windows placement for fit to display." into nyc-dev