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

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



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