Merge "Fix issue #4976176: Font size setting does not persist"