Merge "CaptivePortalLoginActivity correctly gets UserAgent"