Merge "Fixes to handleAppDiedLocked." into klp-dev