And actually, this doesn't work for my use case. If you select F outbound and Y return, you get the mixed cabin itin. But if you choose Y out and F return, both segments switch to F (same as before the update). Oh well.