am 6a1d057b: am 3c2f7e10: fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen

Merge commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a' into eclair-mr2-plus-aosp

* commit '6a1d057ba5f34eb0bf6f5ee92c67424817bef09a':
  fix 2206016 - Passion: Deleted Icons are added again after deleting folder on home screen