Revert "Match items in icon preview with items in Folder using permutations." am: 8701cd58cf

Change-Id: I8365c37da706d1e1fe39e0cd0fbed8a4820b5cb1