Merge "Fix NullPointerException in CaptivePortalLogin"