Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev