Merge "Revert "Fix build: Revert "Record hyphens from Minikin and draw them"""