Merge "Make LocaleUtils#getLanguageFromLocaleString() work again" into main