Merge "Run idle maintenance at the end of tests." into rvc-dev