Merge "Fix CaptivePortalLoginActivity null String crash" into pi-dev