Merge "Using ItemInfoMatcher in place of similar interfaces and utility methods" into ub-launcher3-master