Merge "Replace usages of deprecated fakeShadeRepository with ShadeTestUtil" into main