Merge "Helium: improve contract with ListenerRegistration"