Yeah. That makes more sense to me. I've seen a lot of places 'explain' that it was Olenna, but she was one table further along. The cup was still well out of her reach. Margaery's the only person near it, although the actress plays her as being genuinely surprised/concerned.