Merge "Fix scrollbar margin in rtl layout" into qt-car-dev