Merge "Fix: query TYPE_WIFI usage with empty string"