Merge "Instead of checking for locale, check language specifically." into main