Merge "Remove test flakiness" into sc-v2-dev