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

Change-Id: I26de68247d11627664e4695b69fd36f4ded3551b