am 4ca2aec2: Merge "Add task to list before looking it up." into klp-dev

* commit '4ca2aec2be70026a2f8feee258405647985dc389':
  Add task to list before looking it up.