Fix AppInfo drop target bug

Repro:
 - Pick up a shortcut from Workspace
 - Drop on AppInfo
 - Observe extra screen on right has not been removed

Change-Id: I6c68df27094d964308cc6e2a95917010784725a6
Trebuchet : Add folder on folder checks

- Check if the new folder can accomodate all items
- Don't expand folder if trying to drop folder on folder

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