Merge change 4924

* changes:
  Adding support for recording the visible rect and auto-scrolling.