Merge "Chore: Move to ubuntu2004-builder"