Merge "Introduce ShadeDisplayAware annotation" into main