Merge change 7878

* changes:
  removing visibleRect event and tracking rectangles instead.