am 05def021: am 71a3228b: Merge changes I0d44e948,I1db7a972 into eclair

Merge commit '05def0214087e3525f642e59debf4af57d445604' into eclair-mr2-plus-aosp

* commit '05def0214087e3525f642e59debf4af57d445604':
  Fix 2260199 - App icons placed in folder widget are doubled after rebooting phone.
  Fix bug 2261637 - Workspace previews home screens on long pressing