Merge \\"Protect against crash in font size\\" into nyc-dev am: 4b336099f1
am: bc1764f404

Change-Id: I0808298678eb25b603302c537ca8e9a667fae8bc