Merge "Revert "Cleaning up listener when task completes""