Merge "Fix the momery leak in DrawOverlayDetails"