Merge \\\"Don\\\'t update task to return to type for last task over home\\\"...
Merge \\\"Don\\\'t update task to return to type for last task over home\\\" into nyc-dev am: 62b08eb5 am: 5e2fbdbf
am: 1f662ef5
Change-Id: Ibfbe16322538317c1be4ac25c6b5976f9daa1ed9