Merge "Convert country code to Layoutinfo (Language tag + Layout type)"