Merge "External TV Input Logging: implement display name lookup table and filtering" into main