Merge "Increase RecordThread heap size"