Merge "Prevent construction/use of invalid restore session proxies" into jb-dev