Merge \"Fix pref layouts\" into nyc-support-24.1-dev
am: b9ce75dec4

Change-Id: I58af2c078e965c1a8128936c976b7b826ee53e59