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
am: 0c6e64d1ed

* commit '0c6e64d1ed89ae1956becf08a6544b6d9a668c12':

Change-Id: I41f3c866d2fcb4634f0174d855dd63f9752ce8b6