Fixing potential unsoundness in QP state consolidation

[marcoeilers]

Fixing QP snapshot merging analogous to https://github.com/viperproject/silicon/pull/904, as suggested by @superaxander.

I haven't found a way to trigger the problem yet (and I won't merge this until I do), but it should exist in principle.