Merge "Use AbstractListenerRegistration"