OZP-241: Changing uniqueId to id
Merge branch 'feature/ozp-241-widgetstatemodel-cleanup'