Merge "Don't update task to return to type for last task over home" into nyc-dev