Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev