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

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

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