Merge "Fix remaining cause of a leak in SecondaryDropTarget" into ub-launcher3-master