Merge "Make Typeface member final" into sc-dev