Merge "Fix some bugs/edge cases in ScrollView/HorizontalScrollView"