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

Change-Id: Ic2bea67bf8657d49ae71e3c50be15c22274da426