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