Issue #2820442 by klausi: SimpleTestBrowserTest has random fails when BrowserTestBaseTest gets larger (cherry picked from commit e276eeb1)