Merge "Fixed split in Desktop windowing" into main