Merge "Extracting icon caching logic into a base class." into ub-launcher3-master