Merge "Save window when an app died while it's visible"