Sync up with r21-4-21-chise-sort-by-strokes-diff.