Merge "Reduce test flakiness." into rvc-dev