Merge "CaptivePortalLoginActivity: improve logging"