Merge "Fix icon text size being calculated in DP instead of SP." into sc-dev