Merge "Fixing oav text overlap." into ub-launcher3-rvc-qpr-dev am: 6039c70261

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

Change-Id: I9155c9e8146aaa13deff6a34d7869bb4b09a0fd3