Merge "Further improvements to window management!"