Optimize use_device_name check in base entity class (#106209)

homeassistant/helpers/entity.py

@@ -958,7 +958,7 @@ class Entity(
             return name
 
         device_name = device_entry.name_by_user or device_entry.name
-        if self.use_device_name:
+        if name is None and self.use_device_name:
             return device_name
         return f"{device_name} {name}" if device_name else name