Merge "Re-enable test that is not flaking in the flaky-test suite" into main