Make sure distinct widgets items are used when mapping widget component

names to widget items.

This is to prevent a crash on duplicate key when creating map.

Bug: 204065759
Test: Enabled flag and got no crash
Change-Id: Ice9f93af76c02eeba53c934687358ed806c60b60