Merge changes to BounceScrollView