Also allow deploying without cancelling current activity, and make saboteurs use it (cherry picked from commit 8b4478260e95170f392ef00c1b06b76dfc29bf2b)
