Fix regression with DnD tooltips (#7766)

Change-Id: I74e6c35ef0aa30dbb24301bfb5858cedd0008e71