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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b777b1f3 -s ours am: 126f1267 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7a8e85c -s ours am: 7faa1716 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 3c37e532 -s ours am: b2b6b914 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6fb3386a -s ours am: b5b045b8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: dd0998d9 -s ours am: db771a41 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0e903c5 -s ours am: 3374ded9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 80b14edf -s ours am: 6df6c6e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24979404 -s ours am: 5336700b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9b45e85e -s ours am: e504bd46 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68642f5 -s ours am: e968f060 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f9944da4 -s ours am: 68d71383 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c689794 -s ours am: b1ff683b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 52c932c5 -s ours am: 5e424fa4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e27c87f -s ours am: 8face7c1 -s ours