Merge "Revert "Fix activity leak"" into main