Merge "Update expanded view positioning for RTL" into main