Merge "Use allow_private_profile flag to guard private space API changes" into main