Revert "Fixes bug with extra empty screen staying on Workspace when a"

This reverts commit 41af711d1355ae8c08aff9a2e367c7a0893fd110.

This commit causes a bug where a drag object originating from the workspace
is removed when dropped on the App Info target

Change-Id: I98602d2de6ec079d7003b0c2a2547356ec0d5e43
Fix App Info bug where extra empty screen remains after dropping drag object
on the App Info traget.

Change-Id: Ibce0b75417cf8682ccdb0c6b755a22f34e735f9d
Trebuchet: Remove unused strings

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