Merge "Fix scrollbar position for RTL."