Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"