I think last race they used kimi as a vettel pawn albeit with no detriment to his final position (it is his fault he was slow at start and lost positions). And that is not very nice leaving him on track like that. I bet kimi was fuming. I would not even be surprised if he let bottas pass so easily because he was so mad.
But in Monaco, even though I think the team would prefer a vettel win, I think they didn't do a swap on purpose. It was just the Vet was much faster on older tyres than Kimi on new. And honestly after so so many F*** ups in strategy last year and already this year (pit vet in spain out of SC situation) I doubt they could pull something so finely orchestrated. Anyway at this point everybody has their opinion (about monaco) and that is not gonna change.
Lets see what the future holds. If the situation like China arrises will vettel have to pass his team mate again on track without help and losing tyre life or will team orders be in place since Kimi is already behind Ricciardo in the WDC?