Removed the issue of showing duplicate devices on device lists.
Some modification in regard to the UUID in Constant file.