Merge "Make DEFAULT_DEVICE_FONT_SCALE readable" into main