Merge "Adding support for storing keywords in iconCache" into ub-launcher3-qt-qpr1-dev