Merge "Fix empty desktop mode after closing the last window (part 2)" into main