Merge changes from topic "am-d23ed9d1-698e-43d5-9428-e8e4fc599ee2" into ub-launcher3-master

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 43b5cfe76b
  Import translations. DO NOT MERGE