am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately