Merge "Also add starting window when activity is not alive" into oc-dev