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

* commit '0daa9b92e0b4d7a3a2659b31988b3eb538cf2dbc':
  Add task to list before looking it up.