Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev