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

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

Change-Id: I3680615723b0ef5edf175db01fd44ed068f2147f