I am having the same problem with NavigationSplitView, I don't quite understand your fix proposal. When do you see this fix getting released, if it's not long I'd rather move on.