Merge "Improved layout window management"