Merge "Remove hardcoded typeface pointers"