Merge "Fix formatting in PerformUnifiedRestoreTask{,Test}" into main