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

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



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