ZEN-7159 Fixing issue where devices fail to show up in UI after moving services or serice organizers