Merge "Fix svace issue in GetFontId" into devel/master