am 4aca4c15: Merge "Don\'t reorder windows on non-default display." into klp-dev

* commit '4aca4c1520549ae8b99986a47a08cde311058140':
  Don't reorder windows on non-default display.