Merge "Make sure wifi is not metered." into sc-dev