Merge "The UI only shows the active LE device" into tm-d1-dev