Merge "Avoid double search item highlight" into ub-launcher3-master