Merge changes I54e39cc5,Iec62abae into sc-v2-dev am: 14a7d63c23

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

Change-Id: If86886dc25704f6fd2e864c70987bebd4d940e28