Merge "Don't count finishing activities as effective activities." into lmp-dev