Merge "Revert "Add channel layout for 13.0"" into main