Merge changes from topic "am-24886430-416f-40ff-a65a-472e1f4ab8a9" into ub-launcher3-master

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