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

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

Change-Id: Ieb8933ca6d92d9bd091decd72e78ec4a106bda97