Merge "Revert^2 "Add getAdjustedTypeface/getAdjustedFont method"" into main