Merge "Introduce ShadeDisplayAwareModule" into main