Merge "Remove tweak for Font size"