Merge "Allow third party cookies in the captive portal login app."