Merge "Clarify ShadeDisplayAware annotation usage in SystemUI" into main