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