Merge "Revert "Allow network providers to set yield to bad wifi"" into sc-dev