Merge "Reduce threshold of height for layout of multi-window mode." into nyc-dev