Merge "Track latency of captive portal checks"