Merge "Restore session on new window after app kill" into oc-dev
am: 51785edbe9

Change-Id: I692398a7f044db7f50e1b2f5155e4683f6f5bc31