Merge \"Don\'t update task to return to type for last task over home\" into nyc-dev
am: 62b08eb5f2

Change-Id: Ib6767e4e7e31c6714687bb89ba51f82c0e5ba4b0