Merge "Encoding the locale list in systemState so that icons and labels are updated properly" into ub-launcher3-master