Merge "Revert "[1/n] Create Flag for default font_scale"" into main