Merge "Ensure UserDefined Font family is not changed by system font changing." into...