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

Change-Id: I1db9805befd9a2c1948591c8257394866abcec15