Merge "Search query method should support multiple consumers" into ub-launcher3-master