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

Change-Id: I5c38b2288407f9b34c7f5863d3e3246c925c67a6