Merge "Add two enums for TvSettings App settings" into rvc-dev