Merge "Avoiding blocking worker thread when adding icons to DB" into ub-launcher3-burnaby