am 992ea042: Merge "Don\'t count finishing activities as effective activities." into lmp-dev

* commit '992ea04287486759d1cc17a4f18ff96c15bc47c2':
  Don't count finishing activities as effective activities.