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

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

Change-Id: I98a6730fb4c327fbaf244a2e0713c65a9c1cd6cc