Merge "Fix empty desktop mode after closing the last window" into main