am 010272d7: am 68ba5ca5: Keep banging on the launcher locks up bug.  This moves the delayed zoom stuff into one place, so it should be out of sync less.

Merge commit '010272d7e8e09f76044ba5d23d349594654b05d3' into eclair-mr2-plus-aosp

* commit '010272d7e8e09f76044ba5d23d349594654b05d3':
  Keep banging on the launcher locks up bug.  This moves the