Merge "loopfilter improvements"