Merge \\\"Don\\\'t update mTaskToReturnTo when task is cleared\\\" into nyc-dev am: 1a77efe9 am: bf914699 am: f47f073e Change-Id: I26de68247d11627664e4695b69fd36f4ded3551b