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

Change-Id: I09b4e5e9083362b4cf0aeac1adc934514ce9b31a