Merge changes from topic "am-ba267b72-28d8-4a62-9fa3-dd082d28e8e7" into ub-launcher3-master

* changes:
  [automerger] Deleting invalid icons when an app is restored am: e48fe1095d
  Deleting invalid icons when an app is restored