Merge "Fixed a bug in the scrolling logic"