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 '68ba5ca5d7f17df65f0cc8813603de2d3f215bf4' into eclair-mr2

* commit '68ba5ca5d7f17df65f0cc8813603de2d3f215bf4':
  Keep banging on the launcher locks up bug.  This moves the