Merge "Convert to ISO 639-2/B for menu language"