Merge "Use desktop mode flag for split logic" into main