Merge "Anisotropy correction external displays only" into main