Merge "Show the connected device more reliably"