Merge "TIF: Add a comment to remove padding around the channel logo image"