Merge "Compile CaptivePortalLogin as system_current"