Merge "Remove redundant <Give OSD name> for TV devices" into main