DeviceManager: Minor tidyup in build_display_name