Merge "Testing to see if waiting for resume will fix flaky tests." into sc-v2-dev