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

Change-Id: Ibd14c8a53b8d675298d4e13fc064281813881137