Merge "Fix alignment for RTL layout" into sc-v2-dev