Merge changes I032f7ffc,I384d7af0 into sc-v2-dev am: 94c673c64d am: f5bbbc074e

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

Change-Id: I296e5993e25b077cf0c93e1c8345f1cb0f5fe864