Merge "Add ShadeController implementation based on Scenes" into main