Fix protected folder behavior

Repro:
 - Create a folder with 2 apps
 - Protect the folder
 - Launcher the protected apps activity in settings
 - Uncheck one of the apps
 - Observer the folder is replaced with the other protected app shortcut!

Change-Id: Iee2ac65b1c92f5720c56f87a12520e320db3b4f2
Merge "Fix protected folder behavior" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0