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

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

Change-Id: I180913ba70149443ecf04f52e83b72bf177ee734