Merge "autocomplete: fix duplicate/missing tracking events"