Merge "Anisotropy correction for external displays only" into main