12329 move devices

This is probably not the situation described in the ticket, but it is still a valid scenario which I could reproduce on my system.

I suggest to try this out and then see if it helps on the system of the testers and continue from there.