Merge "Move captive portal detection to another thread"