[DF-1858] Changes for scroll view.