Merge "External TV Input Logging: get actual input id for logging" into main