Merge changes I2af1792e,Ice314d46,Ib17d4a5e into sc-dev am: 7e7116278b

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

Change-Id: Id2fbb744423c5160f7c7fb4d5e746325454c9f53