Merge "Fix drm hal resource leaks" into oc-dev