Merge "QcomModulePkg: Add support of font scale factor as 1"