Merge "Use actual window size for layout" into nyc-dev