Yes. And I would theorize they would've switched back and forth at intervals a lot (the tolerant to mildly hostile feelings) because she has to keep him at bay and let it be known that he's not getting any closer than she wants, but at the same time, they have to work together practically 24/7 and raise children together. If she pushes him away to the point they're both tense and unhappy, they can't work together effectively. So I think she was constantly striving to maintain that "just giving enough to make it workable" status, conflict coming in when he tried to nudge for something more.