Merge "main/app: Fix leaks."