Merge "Honor suspend/pause config switches in scenario tests"