Merge "Add enums for TvSettings logging"