Merge branch 'xanf-master-patch-87309' into 'master'

Revert occasionally increased timeout

See merge request gitlab-org/gitlab!50602

spec/frontend/test_setup.js

@@ -25,7 +25,7 @@ afterEach(() =>
   }),
 );
 
-initializeTestTimeout(process.env.CI ? 6000 : 5000);
+initializeTestTimeout(process.env.CI ? 6000 : 500);
 
 Vue.config.devtools = false;
 Vue.config.productionTip = false;