Merge "Introduce FontStyle for future extensibility"