Merge "Protect against crash in font size" into nyc-dev