Merge change I3656f7a3 into eclair

* changes:
  Honor the mInitialScale set on WebView. This was lost when we fixed restoring the scale for a new page.