am 52f918e4: am 730c408c: Merge change I84bfa565 into eclair

Merge commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a' into eclair-mr2-plus-aosp

* commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a':
  Improve performance of AllApps for large numbers of apps.