Merge "Fix issue #5388352: font size change back to normal"