Merge changes from topic "am-1bd70ed4-061f-4a07-a290-3195cb409e98" into ub-launcher3-master

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe skipped: e185ee54d4
  [automerger skipped] Import translations. DO NOT MERGE skipped: d943aacbfe
  Import translations. DO NOT MERGE