Merge changes from topic "am-7c959190-3b54-4523-8358-e7e50b55e14c" into ub-launcher3-master

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