am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev

* commit 'c9ffd74659fac6f30f3f4653586af2069b903899':
  Don't call setTask twice.