Merge "Layout tests API 15 compatibility" into nyc-support-24.1-dev