Merge changes Ib2bc8419,Ia41cb0e3,I43bfbc41 into sc-v2-dev am: 2d5a8dc847

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

Change-Id: I259caf452690d772c413824d99742a23ad95949b