Merge "Change API for killing app-depentents to also kill main app."