Merge "Avoid auto-connect to networks with no internet" into sc-dev