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

Change-Id: I2b8b3f6dca4b545c770e4221f36f651fd9ca8d21