Merge "Enable auto-add for the font scaling tile" into udc-dev