Merge "Introduce Shade configuration controller" into main