Merge changes from topic 'am-3df8d75d-ddd8-4045-a20e-f35d57b86835' into ub-launcher3-dorval-polish2

* changes:
  Using collator for string matching am: 05d2df1678
  Using collator for string matching