Merge "surface_control: Add ABI type information to `enum`s" into main