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

* commit 'a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
  Finish crashed activities immediately