Merge changes I0ed9ba00,Ia8c6d7fe into jb-mr1-dev

* changes:
  Fix bug removing all windows that belong to a display.
  Add some missing debug output.