Merge changes from topic "am-4ead8eb2a7aa436fb5fd976598e96cd8" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b777b1f3ab -s ours am: 126f1267d8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7a8e85c59 -s ours am: 7faa171675 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3c37e532d8 -s ours am: b2b6b914cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6fb3386ad5 -s ours am: b5b045b829 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: dd0998d992 -s ours am: db771a41b6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0e903c539 -s ours am: 3374ded921 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 80b14edf4a -s ours am: 6df6c6e69a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2497940422 -s ours am: 5336700b48 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9b45e85efe -s ours am: e504bd464b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68642f528 -s ours am: e968f060d8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f9944da4f1 -s ours am: 68d7138391 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6897947d -s ours am: b1ff683ba9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 52c932c581 -s ours am: 5e424fa4d9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e27c87f18 -s ours am: 8face7c17b -s ours