Merge "Cleaning up listeners and AsyncTasks."