Merge "Using add/replace instead of update when updating an entry." into ub-launcher3-calgary-polish