Merge: from waterlevel_deepsea_sample_fix - Bugfix for water level queries incorrectly mixing deep sea and overworld states - Bugfix for deep sea ocean sim using overworld heightmap - Simplified TerrainHeightMap API Tests: ran unit tests, booted into craggy, explored deep sea and swam around