Duplicate device rows if settings are saved
Merge branch 'replace-nest'