Merge changes from topic "am-28715fbefc2c44e5ae5a9c401bb9bb6f" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 7daf1963 -s ours am: 85b5f93b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0281c03b -s ours am: 0b71a5a4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 97b32284 -s ours am: bc2554a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f642a33f -s ours am: f1310781 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c55b27b0 -s ours am: 6765caae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84a6297b -s ours am: 43575e12 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 8afb775c -s ours am: 0098f592 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b33a716 -s ours am: 276c16bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9585783d -s ours am: d7d5416a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbc5088f -s ours am: 801f7423 -s ours