Merge changes Id256010d,I3370ec14

* changes:
  Add `Display` indicator to display rects
  WM trace rects shouldn't by multiplied by -1