Merge changes from topic "am-a97d3e7d45dd4e16bff8b038d6ff967b" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ec55450f -s ours am: 17b7851c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba483b5c -s ours am: 951187a0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c30efc1a -s ours am: 24ab0d1d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 705af02c -s ours am: 69235839 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 93a03c80 -s ours am: 517346dd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb63aa73 -s ours am: d2adf31d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f7974aec -s ours am: f51fa55f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1eafee1 -s ours am: da6120c0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4ed3d367 -s ours am: d11468f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d59d89f -s ours am: f4a6ec54 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f4ff4b04 -s ours am: 469739df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c371af84 -s ours am: cbceb6de -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ca920794 -s ours am: a23228cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1541b9cb -s ours am: d9d8edb3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 89b076f7 -s ours am: 9ccd9c08 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ea84694 -s ours am: 75902b94 -s ours