Merge \"Bumping icon version to clear db to trigger loading from IconProvider.\" into ub-launcher3-calgary
am: 3ddb64efb5

Change-Id: I348c23d87d2d6d58734009b9c1b6555c24f84e37