Merge "Reduce cutoff size for multi-window layouts to 500dp." into nyc-dev