Add missing code from main into staging branch

[francoisl]

Details

This merges the changes between main and staging into staging, in order to add code from #10935 that should be on the staging branch, but isn't.

The changes are obtained with:

git diff staging..main > staging.diff
git checkout staging
git checkout -b francois-fixStaging
git apply staging.diff

Tests

N/A

PR Review Checklist

N/A

[francoisl]

Ignoring contributor and reviewer checklists - this PR doesn't add any new logic, just adds missing code onto the staging branch.

[OSBotify]

🚀 Cherry-picked to staging by @francoisl in version: 1.2.0-3 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

[OSBotify]

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.