Merge "Use @ShadeDisplayAware Context and configuration in notification classes" into main