Merge "GraphicsEnv: Add FeatureOverrides" into main