Merge "Prepare CaptivePortalLogin for system_current"