Merge "Rename language+country resources to just language" into ub-launcher3-master