Merge "Remove redundant computeScroll() call for hw-accelerated views"