Merge "[scroller] bug fix for bounce"