Merge "Fix scrolling issue in Stream/PageListView"