Merge "Add 1.05 and 1.2 as new possible font scale values" into 24D1-dev