Merge "Fix pref layouts" into nyc-support-24.1-dev