chore: Cherry pick fixes for update of default branch to main #28274

All 126 136 tests pass, 56 skipped in 56m 39s

1 626 files ±0 1 626 suites ±0 56m 39s ⏱️ - 1m 29s
126 192 tests ±0 126 136 ✅ ±0 56 💤 ±0 0 ❌ ±0
132 487 runs +1 132 431 ✅ +1 56 💤 ±0 0 ❌ ±0

Results for commit a5d36a8. ± Comparison against earlier commit 0757288.