Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: e6f0509d1d

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

Change-Id: I9b3d03c8050ac47e0368161dba58110b0e047605