Merge "Use "don't actively prefer" timeout when avoiding bad wifi"