Ensure that mailbox setup can proceed after activity was destroyed

4 jobs for !1678 with 2342-mailbox-setup-stuck in 8 minutes and 47 seconds (queued for 1 second)
latest merge request