Uniform Inference in Linear Panel Data Models with Two-Dimensional Heterogeneity