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

Change-Id: Ieba9858a808080aba74a3fd45021dac69ad83453