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

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

Change-Id: Ie1370d87b4a2d7d3e4286a3c15133038e49caad7