Merge "Fix multithreaded encoding for 1 MB wide frame"