Merge "Fix layout margins for RTL" into udc-dev