Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: 54433ee9cc am: 2854d6e3d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15003917

Change-Id: I65dc93cafb4f12b7db1ecb840a2b264d42ed9c9c