feat: cherry pick improvements

[Garzas]

---

PR Submission Checklist for internal contributors

• The PR Title

  • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
  • contains a reference JIRA issue number like SQPIT-764
  • answers the question: If merged, this PR will: ... ³

• The PR Description

  • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

---

What's new in this PR?

Cherry pick from #2115

[github-actions]

Unit Test Results

   412 files     412 suites   22s ⏱️
2 262 tests 2 142 ✔️ 120 💤 0 ❌

Results for commit 4ea75f4.

♻️ This comment has been updated with latest results.

[datadog-wireapp]

Datadog Report

All test runs 452b849 🔗

✅ 2 Total Test Services: 0 Failed, 0 with New Flaky, 2 Passed

Test Services

Service Name	Failed	Known Flaky	New Flaky	Passed	Skipped	Wall Time	Branch View
kalium-ios	0	0	0	2142	120	9m 8s	Link
kalium-jvm	0	0	0	2259	98	12m 48s	Link

[codecov-commenter]

Codecov Report

❗ No coverage uploaded for pull request base (release/candidate@7603587). Click here to learn what that means.
The diff coverage is n/a.

@@                 Coverage Diff                  @@
##             release/candidate    #2171   +/-   ##
====================================================
  Coverage                     ?   58.16%           
  Complexity                   ?       21           
====================================================
  Files                        ?     1010           
  Lines                        ?    37721           
  Branches                     ?     3434           
====================================================
  Hits                         ?    21939           
  Misses                       ?    14311           
  Partials                     ?     1471           

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7603587...69223b6. Read the comment docs.