Merge changes from topic "am-bd8cd6883e764b249ef0dd98dbf55068" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d8b9ed35 -s ours am: 18175b65 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c8dc9ec -s ours am: 9e06c869 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 52ac45a3 -s ours am: 0c49c72c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e56c4e3 -s ours am: 711db070 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9d1fcfa3 -s ours am: 696d6cfb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 038fbfe2 -s ours am: bc221292 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bc21c74d -s ours am: 5508fc71 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3743fb04 -s ours am: c9a31446 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e7282141 -s ours am: 02f6b686 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 222023a2 -s ours am: 64b24f9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 52c98be3 -s ours am: af3e7d07 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2e71f5f -s ours am: d735df25 -s ours