Merge "Fix more flaky tests caused by top resumed state" into sc-v2-dev