Merge "Enhance global settings for carrier-specific "avoid bad WiFi" behavior" into main