am 616e3a08: am 8eea3914: fix 2315821 and 2315729 - problems caused because the apps list could become unsynchronized with the list of icons.

Merge commit '616e3a0892511e14b812228e6e8d879c44082cb4' into eclair-mr2-plus-aosp

* commit '616e3a0892511e14b812228e6e8d879c44082cb4':
  fix 2315821 and 2315729 - problems caused because the apps list could become