Show the connected device more reliably

Test: manual
Change-Id: Ief39215321e0a283f724dd0b0cdf5b9eeab1e116
Fixes: 72494077
2 files changed