Merge "Fix no-handler callback registrations"