Merge "Fix RTL layout" into udc-dev