Merge changes I65d2b1bc,I35bf9cb4 into sc-dev am: 5f35ff021d am: 3b0e6a7064

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

Change-Id: I2b0ee7b6c812b617be45dde7440e2206873e6fe8