Merge "Move CaptivePortalProbeResult to its own file" into pi-dev