Merge "Remove reference when active listener is unregistered"