Merge "Check FontFamily null before adding it." into sc-dev