Merge changes from topic "am-b2190f70-93ef-44e6-8473-41d098cf486b" into ub-launcher3-master

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619 skipped: 18b5715113
  [automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619
  Import translations. DO NOT MERGE