Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev