Merge "Scenario: remove the `addCleanup_with_wait` helper method."