Trebuchet: add lockscreen wallpaper picker

Change-Id: Ic4f2589924a3c61b676db907f08108286dc45c29
Signed-off-by: Roman Birg <roman@cyngn.com>
Cleaning up references to mDragView after reordering Workspaces

Change-Id: I480142b4714034c5579232a6a0d30f3aecb687ac
Fix NPE if a moved cell does not have a parent

This NPE should actually never happen. It did however and crashed
Trebuchet.
Symptom that will lead to this NPE: Drag Shortcut from homescreen
to somewhere else. Old icon will not get removed while dragging.
This should also be fixed!

Change-Id: I5b5070c93077e69f0f63a26d337fb9aee83ec6d2
Folders: Merge Folders

This allows a folder A's contents to be merged into folder B
when folder A is drag/dropped onto folder B.

Change-Id: I41d62d04b6b4f0932cc68fb6d2a3be111b063d53
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD