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