Refactor to separate restoration from loop filter Change-Id: Iab517862d957f3aa2a664e9349d57bbf424febb3