Merge "Fix bug #9302365 HorizontalScrollView is not RTL aware"