Merge "Turn off additional logging in text rendering" into nyc-mr1-dev