Bug 637020 - Invalidate windows after they have been restored to ensure their data is collected the first time we save. r=yoric, a=bajaj