Merge "Fix the activity leak" into main