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
(cherry picked from commit aaadc7841203af5492b2cb830cc15bc9375448d7)
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
(cherry picked from commit f29645157ef778f245bc5b4f198c85ce585bb482)
Revert "Trebuchet : Fix overscroll overlay issue"

This reverts commit f29645157ef778f245bc5b4f198c85ce585bb482.

Change-Id: Iad637a25ab51ee60bf7a8b3a040abe7d5b709789
(cherry picked from commit e1d8965c302938aeeafeaf456348e57f3f8ec417)
Trebuchet : Only reset overscrolled child

Change-Id: Ief240c7fbbe296673ff4124cd4d463c9ba65f764
(cherry picked from commit 73da300a628435dac32da5630e33057ae5c03cd9)
Automatic translation import

Change-Id: I7826b798d4ba852af567e895bd4850a7eea599d9
(cherry picked from commit 62316414fc295456cf980e387a27e9236cba75ac)
Fix name of default

Change-Id: I562dc2572f1d8fdb69f615d1a7f0f425cc27d698
(cherry picked from commit 98adac0552dd188c2241636a2ddb7d1538f26f81)
Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit 5bd2daf53614d9d47514be7c6ac702474a523cef)
Merge "fix READ_SETTINGS/WRITE_SETTINGS to be "dangerous"" into cm-11.0
(cherry picked from commit 614620e5d2c4d820fd3a26fa61f8cab7f3a60f93)