Merge "Fix incorrect layout in RTL" into sc-dev