Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: 18d07beef4

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

Change-Id: I721d24e08f6ddf2d9be73392d66f25daa3346d5b