Merge "Revert "Fix various text size problems when system font size is huge""