Merge "Remove font file name dependency" into sc-dev