Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev