Merge "media: max channel capability is extended to 6"