Merge "Fix memory leak in DRM framework"