Merge "Update usage of FontCollection interfaces." into sc-dev