Flint: save/restore the lock state

Requested by BM18