Merge "Decouple system feature API codegen from feature definitions" into main