Merge "Added a new wifi_badging_thresholds setting to Settings.Global"