Merge pull request #1339 from sgrenier/next

Terrain cleanup
Minor changes in TerrainSample
Merge pull request #1341 from seanpaultaylor/next

Minor changes in TerrainSample
Added support for encoding multiple font sizes into a single GPB with gameplay-encoder.
Font class and related text rendering was updated to support multi-font GPBs.