Fixed an issue where scrolling didn't work anymore after going to landscape am: f629b618

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

Change-Id: I86823678188003849468dd4a86d8914e45f5136d