Merge "Fix HorizontalScrollViewFunctionaTest" into main