Merge "c2: set c2inputsurface to -1" into main