Making this test a lot less flaky, wait on the condition.
Merge branch 'resharding'