Merge "Fix leaking the first activity while preserving windows."