Merge "Add ShadeDisplaysInteractor to ShadeDisplayAwareModule" into main