Merge change 21468 into eclair

* changes:
  Couple of fixes for viewport.