Revert "Use SessionStore.jsm only."

This reverts commit 97637256a80a0a224aeeb6e69b804664d5abbc4f.
This fixes a breakage of session restoration behaviors. The public symbol "SessionStore" doesn't have "TabRestoreStates", it is not exported.
Avoid error for undefined symbol "AeroPeek"
Fix path to AeroPeek module
Merge remote-tracking branch 'upstream/master'