9-patch patchset to fix various memory leaks