Merge "Fix text on tab was not located in the middle" into udc-dev