Merge "Move flag feature_overrides to namespace "gpu"" into main