Merge "Fix some sizes that weren't changing for font scale / display size`" into sc-dev