Merge "Refactor calling loopfilter code."