Merge "Fix another multithreaded encoder loopfilter race condition"