am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev

* commit 'ade5f387fa3e1c7d0de16a3d80fb8e3d5105a39b':
  Revert to jb-mr2 handling of app died.