Merge changes from topic "am-ce2e37876c5d4d7fb40f25fc0da90c71" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2232a502 -s ours am: 16e1e7a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 847f4501 -s ours am: 30d26f13 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 881ff42a -s ours am: 119610f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2989a630 -s ours am: 57126ef7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 635e681d -s ours am: fd69fb70 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8b38fe1 -s ours am: b2e3fb99 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: e2f886dd -s ours am: 6ca24575 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0791dff8 -s ours am: c352ad9b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d25d2313 -s ours am: 0b218ad0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d22e605a -s ours am: 40904424 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f5401556 -s ours am: 161db220 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7a137d8 -s ours am: ce0794ed -s ours