Merge "Retry captiveportal check even if only one addr" into klp-dev