AI-675 : following Alex's advice to add/remove listener on component mount/unmount.