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