ZEN-10952 Adding a single device through ui produces 2 devices