Merge "Cleaning up listener when task completes"