Merge "Don't reorder windows on non-default display." into klp-dev