Merge change 25280 into eclair

* changes:
  Don't scroll on load if titlebar is visible