Merge "Close system windows when toggling overview" into tm-dev