Use the latest strapped to fix fonts
Resolve merge conflict
Resolve merge conflict
Merge pull request #1013 from kyungmin/update-strapped

Use the latest strapped to fix fonts