Merge "Fixes scroll bar issues." into tm-dev am: 6bb327888e

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

Change-Id: Ia403e2c65047bc421a54e42b3ef51f48748e61de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>