Merge "Remove all color logic from base folderitemviews."