Fixed an issue where scrolling didn't work anymore after going to landscape am: f629b618 am: 43ada632 am: f8fddaf9 am: 10fbf2e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12013417

Change-Id: Ic3a7263b7fe7e0620f4f16e25772c21874d27064