Merge "Also add starting window when activity is not alive" into oc-dev
am: 6a5e68f784

Change-Id: Ic72ff004aec348af6100c4f20e4d9a4909c78e94