Ensure we cleanup screenshot after wait-retry