Merge "Reduce RBC test flakiness" into sc-dev