I’m thinking now that the death has probably been filmed earlier than I first thought 3×16 I’m guessing.
That was what Kollie said on Twitter, and people have said she’s been reliable about spoilers before. She also mentioned that they film scenes out of order, which I can believe at least since its pretty common place in the industry. So I guess it depends on how much you trust her, but again she’s had a good track record.