Bug 1029834 - Make contextmenu/menu telemetry more consistent. r=mfinkle