Mask mode: Add support for restoring session.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Mask mode: Add support for restoring session.