Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev