am 96a3f90c: am 28b32cbd: am 39ea5106: am b767166b: am 46830418: am 2da0a053: Fix small scrolling regression

* commit '96a3f90c9a0d34cc58592b5954986551645696c2':