Merge change 22452 into eclair

* changes:
  don't center zoom on size change if zoom is in progress