Merge "Fix textStyle being ignored for Font resources in TextView"