Merge upstream master
TAS: Trim leading/trailing spaces from channel name
This fixes TV logo lookup for channels with leading/trailing spaces