Merge changes from topic "am-3df8ff9b-c4af-41c1-85f8-6d2ce4299eac" into ub-launcher3-master

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