Merge "Cosmetic changes to loop restoration" into nextgenv2