Merge "Merge \"Don\'t update task to return to type for last task over home\" into nyc-mr1-dev am: fc20505e37" into nyc-mr1-dev-plus-aosp