Merge "Updating font test after the TextView fix"