Merge "Replace base::RandInt with std::uniform_int_distribution" into main