Merge "Match language-specific flags before default locale country matches" into idea133