Merge "Don't call set_buffer_count for single buffer surfaces" into main