🍒 Cherry pick PR #6161 to staging 🍒#6167

Merged

OSBotify merged 2 commits into

OSBotify-cherry-pick-staging-6161

Nov 2, 2021

Commits on Nov 2, 2021

Merge pull request #6166 from Expensify/version-BUILD-ef05ca8e614c0dfc4e0a4c2145e673eb2054e24b

OSBotify
authored and
OSBotify
committed
Merge pull request #6161 from Expensify/revert-5745-fix-back

yuwenmemon
authored and
OSBotify
committed