Merge "Adds Google account login during private space setup" into main