Merge \"Merge \\\"Don\\\'t update mTaskToReturnTo when task is cleared\\\" into nyc-dev am: 1a77efe9ba am: 84db67cb71\" into nyc-mr1-dev-plus-aosp
am: 4a884e6884

Change-Id: I6e0650751f8e38df4e979cd036e5a81e5c60b688