Merge change 24008 into eclair

* changes:
  Clean up from earlier changes to place title bar at top of WebView