Merge "Upgrade CaptivePortalLogin to SDK 31"