CoreWM: Better WindowSwitcher behaviour (2)