Merge "Set the settings key when the font size is changed" into udc-dev