Merge "Allow 8 channels in RecordThread" into mnc-dev