Merge "Fix font family in QS" into sc-dev