Merge "Add non420 code in multi-threaded loopfilter"