Merge "Introduce ShadeDisplaysInteractor" into main