Merge change 26414 into eclair

* changes:
  Update viewport when height or width change.