Merge "Update to use `main` for new Rust 3p projects." into main