Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp