Merge "Correct shadowtext glyph count"