Merge "Revert^2 "Provide @ShadeDisplayAware ConfigurationInteractor"" into main