Merge "CaptivePortalLogin correctly unregisters callbacks"