Merge "Add memory leak tracking/debugging code to drm server"