6d7a006302
Test: scroll vertically and horizontally
Fixes: 196309367
Change-Id: Ibf16fb72cf95e29ed820d5f511e764a388c93bb0
Merged-In: Ibf16fb72cf95e29ed820d5f511e764a388c93bb0
(cherry picked from commit b259a896f5)