Merge "Using collator for string matching" into ub-launcher3-dorval-polish