Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f4b am: e0a0876062 am: af957e82c4 am: cd902c0fc0

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

Change-Id: I7def4bc74da0e4bf8ce19bd281d90945f45a6a3d