am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev

* commit '9d958f69939e884450e5bd6588dedb16aefed6e4':
  Allow killed task to remove itself