Merge "Fix carrier-specific Wi-Fi settings appears in search - even on non-carrier phone"