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: I8d5a54fbe06b098ef7addf8242eda0fc501d3d65