Merge changes I72139780,I8e563654

* changes:
  Fix screenshotting with includeDecor=true in multi-window
  Implement restoring & correct caching of snapshots