Merge "Proper refcounting for Minikin objects"