Better handle timeouts for generated tasks with repeated execution

When generating tasks, we dynamically set the timeout based on the previous execution times. If, however, repeated execution is enabled, the timeout needs to take that into account.