Merge "Add GTE compatibility enum to Surface." into main