Merge "Loop filter code cleanup."