Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: ed7d1c052e

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

Change-Id: Iecdc986f3287ec66b2fb7e46d450d06af3027eea