Merge "Add empty implementation of ShadeController" into main