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

Change-Id: I7a901be3116ee6ee8005ee7d6e41c1781ad02718