Merge "Make sure distinct widgets items are used when mapping widget component names to widget items." into sc-v2-dev