Merge "Merge "Reduce threshold of height for layout of multi-window mode." into nyc-dev am: 51e88c1c2d am: 9434d8df23" into nyc-mr1-dev-plus-aosp