Merge "Don't call setTask twice." into klp-dev