Merge "Ravenwood: Support LocaleList" into main