Activity: make sure it's always marked as done when finished running to avoid deadlocks in test cases
Merge branch 'fix-deadlocks'