Merge "Use CaptivePortalProbeSpec method in portal app" into pi-dev