Merge "Don't layout too many items for the test" into nyc-support-24.1-dev