Merge changes I49ffd26b,Ib47a7c96

* changes:
  Better controls on rects view.
  Window Manager viewer