Merge "Fix when adjusting the display size, the font size flashes."