Merge changes I6ce23251,I56fca1b7 into sc-dev am: cb6dff62d9

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

Change-Id: I00694651565621415b08a0cabf6936ada9fbbaeb