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

* commit '97f81c16ca1b2dcbf14ac1971ef364ca1bad6080':
  Don't count finishing activities as effective activities.