Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021ce6 am: 72ac4fa778 am: 5e9126be41

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

Change-Id: I9cd07e12ed105ee30966e5484209d95d9b06d6da