Merge changes Ib7d3a07e,Ic22ccf17 into sc-dev am: b009faca5e am: bf277d2431

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

Change-Id: I8b865dc6da6994912126deceaaf08633a578590e