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

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

Change-Id: I30f768e44bd50a06a8f6c74fa44b7ca069abd94b