Merge changes Ice83b544,If0bc2a6d into sc-dev am: 30ffc3f95c am: e4e7a13603

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

Change-Id: I9162ad674087c35bb360dae49a84967f8fa691e4