* commit '2418f50f27a52c471e078944e4bbe832daf301ee': Fixing scrolling regression with layout changes.