Merge "Scenarios: remove redundant call to `resource_setup()`"