Merge "Add ComponentName for Font Size" into udc-dev