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

Change-Id: Ibf43a0588feb20e94cc8aaec1193e06e5b3426b4