update device name in tree fixed
Merge branch 'refs/heads/dev' into feature/colors