[stable30] ci: Attempt to make cypress tests more stable with a unified wait for close

[stable30] ci: Attempt to make cypress tests more stable with a unified wait for close #1880