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

Change-Id: I0e34f2a0b17b702e1e29bbb5f3c73e09811ed1a6