Merge "Don't kill home process with the rest of its package." into klp-dev