Merge "Add locusId as something taskOrganizers care about" into sc-v2-dev