Merge "Change for localization to increase text size" into main