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