Merge "Handle SSL errors in CaptivePortalLoginActivity"