Merge "wrap non420 loop filter code in macro"