Selenium tests: Preventing conflicts of duplicate items

Change-Id: Ib01d7b74d82e586e478115280a7affee83b8616a
Merge "Selenium tests: Preventing conflicts of duplicate items"