Merge "Introduce AnyExternalShadeDisplayPolicy" into main