Merge upstream-mesa-9.0.3