Fix HideIcon behavior in Folders

https://jira.cyanogenmod.org/browse/CYAN-5022

Change-Id: I6da2e8ee4b3ab4fede10553a422f5520eb6e1293
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0