Add $display-font-family
and $display-font-style
#36711
Merged
$display-font-family
and $display-font-style
#36711