Merge "Remove input channel from visual indicator" into main