am c57bb9b1: Merge "Icons are not updated to TYPE_APPLICATION during restore" into ub-launcher3-burnaby

* commit 'c57bb9b113aff1315ea4e871f09e94406cfe56e8':
  Icons are not updated to TYPE_APPLICATION during restore