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
Trebuchet : Fix overscroll overlay issue

When overscrolling in the app drawer, certain effect/page combinations
cause the pages to be overlayed.

Reproduction :
- Have 2 pages in the app drawer
- Set scroll effect carousel,rotate up/down
- Overscroll one of the pages and let it settle
- Should see first and second page stacked together

Change-Id: Iaa2b06970e2f5d3dda51ce5bf2259523738f7779