Merge changes from topic "am-f553b0f9-eb52-4251-808b-e8ab4206b861" into ub-launcher3-master

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