Merge "Make ScrollBar widget aware of layout direction"