Merge "Reuse AbstractListenerRegistration"