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

Change-Id: I876b22511c4f5fa9c981af394c90fdf9321e4550