Merge "Add option to skip and avoid captive portals."