Merge "Fix HorizontalScrollViewFunctionaTest" into udc-qpr-dev