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

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



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