Device discovery doesn't work when re-adding device

If you remove a device immediately after adding it (before discovery finishes) and add the same device again, it will not be discovered properly (but doing "Backup now" or after next scheduled backup, its discovered correctly).