Merge change 7879

* changes:
  adding support for tracking the visible rectangles.