Merge "Fix activity leak" into main