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: I38ace4adec4591e9259a8859ed547e1b951b922c