Merge "Correct portIdToPath for TV" into main