Revert "Merge pull request #23551 from mnjul/bug_1060541_lckscr_noti_scrolling_hvga_for_1038723"

This reverts commit 3c6b2328b9527a31a1c716151bdb5983291a828c, reversing
changes made to d170091ba1b5597b05f37fb259f6b8eb02568798.