Merge "Fix the activity leak issue" into main