Squash-merge branch 'gallium-clip-state'