Merge \\"Revert \\"Don\\'t update task to return to type for last task over...
Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am: 5c176ff1
am: 01cc848c
Change-Id: I09b4e5e9083362b4cf0aeac1adc934514ce9b31a