Merge "add flag for clip shader API" into main