Bug 1029735 - ContentSearch sometimes leaks event listeners and their closures (follow-up). r=ttaubert