[stable30] Fix flaky cypress tests

[backportbot]

Backport of PR #6965

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.60%. Comparing base (f6aa09e) to head (5162bb4).
Report is 7 commits behind head on stable30.

Additional details and impacted files

@@ Coverage Diff @@## stable30 #6967 +/- ##
=========================================
Coverage 53.60% 53.60% =========================================
Files 116 116 Lines 2582 2582 Branches 524 526 +2 =========================================
Hits 1384 1384 Misses 1070 1070 Partials 128 128 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.