Merge "config: sm6150: enable concurrency for surround recording"