Merge "Use std::sync::OnceLock rather than once_cell." into main