Merge "Explicitly manage fonts and ICU data"