## Justification
Why do we need this cherry-pick? Does it align with our [guidelines](https://www.notion.so/warpdev/How-We-Work-Releases-8e7d7cb4f2ca44b880fa1d0ae4876473?pvs=4)?

## Testing
How did you test this change? What automated tests did you add? If you didn't add any new tests, what's your justification for not adding any?

## Validation
- [ ] I've cut a new WarpDev to validate this change
- [ ] If this change is Wednesday or later, there's a dedicated bug bash scheduled for either this change or the release